update to use UTF-16LE encoding; remove now-unnecessary encoding note from xmldoc...

diff --git a/internal_styles.cc b/internal_styles.cc
index dfede78dc4aad4bcd124cf7927c2b281ccfdf49f..52fc363914072f38855f16c5fb748f6d12ae4aaf 100644 (file)
--- a/internal_styles.cc
+++ b/internal_styles.cc
@@ -750,7 +750,7 @@ static char igoprimo_poi[] =
   "FIELD_DELIMITER             PIPE\n"
   "RECORD_DELIMITER    CR\n"
   "BADCHARS            \"|\n"
-  "ENCODING            UTF-8\n"
+  "ENCODING            UTF-16LE\n"
   "#\n"
   "# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n"
   "#\n"

diff --git a/reference/igoprimo_poi.upoi b/reference/igoprimo_poi.upoi
index 0297c837f517aa75706fee102aa3e31143f75b62..7bfa7363085cdcea2f7c597946351d61efd86286 100644 (file)
Binary files a/reference/igoprimo_poi.upoi and b/reference/igoprimo_poi.upoi differ

diff --git a/reference/igoprimo_poi~upoi.csv b/reference/igoprimo_poi~upoi.csv
index 6b665727fb53af230c3353e2c8adc51915db98ef..3af994f90617e341ec91764467b443c2f2e9f8bf 100644 (file)
--- a/reference/igoprimo_poi~upoi.csv
+++ b/reference/igoprimo_poi~upoi.csv
@@ -1,10 +1,7 @@
 No,Latitude,Longitude,Name,Address,City,PostalCode,Phone
-1,50.877341,12.433889,"3","Hauptstrasse -1",,,"03741-999999"
-2,50.964955,12.435919,"Altenburg-Umgehung",,"Plauen",,"03741-999999"
-3,50.610795,12.173802,"Elsterberg",,,,"03741-999999"
-4,50.844126,12.408757,"Gosel",,,,"03741-999999"
-5,50.654763,12.204957,"Greiz",,,"8523","03741-999999"
-6,51.314521,12.409143,"HMMMM","Hauptstrasse -2","Plauen","8523","03741-999999"
-7,50.493663,12.107153,"Jahnstrasse",,,"8523","03741-999999"
-8,50.493837,12.106101,"Liebknechtstrasse",,,"8523","03741-999999"
-9,50.492619,12.105449,"NARVA",,,"8523","03741-999999"
+1,38.870741,-77.103000,"Cathedral of St Thomas More","Cathedral Ln","Arlington","22203","+(1)-(703)-5251300"
+2,38.889742,-77.013587,"Capitol Reflecting Pool",,"District of Columbia",,
+3,38.884787,-77.439315,"McDonald's","Brookfield Corporate Dr","Chantilly","20151",
+4,38.952749,-77.447755,"Washington Dulles International Airport","Saarinen Cir","Sterling","20166","+(1)-(703)-5722700"
+5,38.857596,-77.226819,"Inova Fairfax Medical Campus","Gallows Rd","Fairfax","22031","+(1)-(703)-7764001"
+6,38.871771,-77.008025,"Nationals Park","S Capitol St SE","Washington","20003","+(1)-(888)-6326287"

diff --git a/reference/igoprimo_poi~upoi.gpx b/reference/igoprimo_poi~upoi.gpx
index 0113994e9c5ded721039c6d5a8bcc80830d9f046..1586ef6760e4fe0cb5d1930a573d24502baafd13 100644 (file)
--- a/reference/igoprimo_poi~upoi.gpx
+++ b/reference/igoprimo_poi~upoi.gpx
@@ -1,50 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gpx version="1.0" creator="GPSBabel - http://www.gpsbabel.org" xmlns="http://www.topografix.com/GPX/1/0">
   <time>1970-01-01T00:00:00Z</time>
-  <bounds minlat="50.492619000" minlon="12.105449000" maxlat="51.314521000" maxlon="12.435919000"/>
-  <wpt lat="50.877341000" lon="12.433889000">
-    <name>3</name>
-    <cmt>3</cmt>
-    <desc>3</desc>
-  </wpt>
-  <wpt lat="50.964955000" lon="12.435919000">
-    <name>Altenburg-Umgehung</name>
-    <cmt>Altenburg-Umgehung</cmt>
-    <desc>Altenburg-Umgehung</desc>
-  </wpt>
-  <wpt lat="50.610795000" lon="12.173802000">
-    <name>Elsterberg</name>
-    <cmt>Elsterberg</cmt>
-    <desc>Elsterberg</desc>
-  </wpt>
-  <wpt lat="50.844126000" lon="12.408757000">
-    <name>Gosel</name>
-    <cmt>Gosel</cmt>
-    <desc>Gosel</desc>
-  </wpt>
-  <wpt lat="50.654763000" lon="12.204957000">
-    <name>Greiz</name>
-    <cmt>Greiz</cmt>
-    <desc>Greiz</desc>
-  </wpt>
-  <wpt lat="51.314521000" lon="12.409143000">
-    <name>HMMMM</name>
-    <cmt>HMMMM</cmt>
-    <desc>HMMMM</desc>
-  </wpt>
-  <wpt lat="50.493663000" lon="12.107153000">
-    <name>Jahnstrasse</name>
-    <cmt>Jahnstrasse</cmt>
-    <desc>Jahnstrasse</desc>
-  </wpt>
-  <wpt lat="50.493837000" lon="12.106101000">
-    <name>Liebknechtstrasse</name>
-    <cmt>Liebknechtstrasse</cmt>
-    <desc>Liebknechtstrasse</desc>
-  </wpt>
-  <wpt lat="50.492619000" lon="12.105449000">
-    <name>NARVA</name>
-    <cmt>NARVA</cmt>
-    <desc>NARVA</desc>
+  <bounds minlat="38.857596000" minlon="-77.447755000" maxlat="38.952749000" maxlon="-77.008025000"/>
+  <wpt lat="38.870741000" lon="-77.103000000">
+    <name>Cathedral of St Thomas More</name>
+    <cmt>Cathedral of St Thomas More</cmt>
+    <desc>Cathedral of St Thomas More</desc>
+  </wpt>
+  <wpt lat="38.889742000" lon="-77.013587000">
+    <name>Capitol Reflecting Pool</name>
+    <cmt>Capitol Reflecting Pool</cmt>
+    <desc>Capitol Reflecting Pool</desc>
+  </wpt>
+  <wpt lat="38.884787000" lon="-77.439315000">
+    <name>McDonald's</name>
+    <cmt>McDonald's</cmt>
+    <desc>McDonald's</desc>
+  </wpt>
+  <wpt lat="38.952749000" lon="-77.447755000">
+    <name>Washington Dulles International Airport</name>
+    <cmt>Washington Dulles International Airport</cmt>
+    <desc>Washington Dulles International Airport</desc>
+  </wpt>
+  <wpt lat="38.857596000" lon="-77.226819000">
+    <name>Inova Fairfax Medical Campus</name>
+    <cmt>Inova Fairfax Medical Campus</cmt>
+    <desc>Inova Fairfax Medical Campus</desc>
+  </wpt>
+  <wpt lat="38.871771000" lon="-77.008025000">
+    <name>Nationals Park</name>
+    <cmt>Nationals Park</cmt>
+    <desc>Nationals Park</desc>
   </wpt>
 </gpx>

diff --git a/style/igoprimo_poi.style b/style/igoprimo_poi.style
index abfb9617d1c1a6d9ee5192d01070dda9e82a2d1a..36df8afa87edf46a1a3397131b7a2e2de26ec1c5 100644 (file)
--- a/style/igoprimo_poi.style
+++ b/style/igoprimo_poi.style
@@ -13,7 +13,7 @@ DATATYPE              WAYPOINT
 FIELD_DELIMITER                PIPE
 RECORD_DELIMITER       CR
 BADCHARS               "|
-ENCODING               UTF-8
+ENCODING               UTF-16LE
 #
 # INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:
 #

diff --git a/xmldoc/formats/igoprimo_poi.xml b/xmldoc/formats/igoprimo_poi.xml
index aab18b03c27a93cdb72b9f0828ab217db31ab393..075721b9b6f973dcd66caafd527d40b3cf86dc3e 100644 (file)
--- a/xmldoc/formats/igoprimo_poi.xml
+++ b/xmldoc/formats/igoprimo_poi.xml
@@ -2,10 +2,4 @@
    igoprimo_poi supports POI files from <productname>iGo Primo</productname> 'next generation
    navigation' devices. iGo Primo is GPS Navigation Software that runs on Windows embedded
    platforms, and is used in some OEM and aftermarket automotive head units.
-</para>
-<para>
-   NOTE: GPSBabel should seamlessly read and convert .upoi files from your device. However, 
-   when converting to .upoi format, GPSBabel will encode as UTF-8, which the device won't read
-   correctly. You will need to manually convert the output file to UTF-16 LE (UCS-2 LE BOM)
-   encoding using a text editor, and then it will work as expected.
-</para>
+</para>
\ No newline at end of file